Skip to content

Conversation

@robertkirkman
Copy link
Member

@robertkirkman robertkirkman commented Nov 9, 2025

@robertkirkman robertkirkman force-pushed the fix-conflict-of-editing-tur-folder-and-tur-on-device-folder-simultaneously branch 2 times, most recently from 95e7d00 to d9cce5e Compare November 9, 2025 11:17
@robertkirkman robertkirkman force-pushed the fix-conflict-of-editing-tur-folder-and-tur-on-device-folder-simultaneously branch from d9cce5e to 4b97c8a Compare November 9, 2025 11:20
@robertkirkman robertkirkman force-pushed the fix-conflict-of-editing-tur-folder-and-tur-on-device-folder-simultaneously branch 14 times, most recently from e3b6f11 to 50c80e0 Compare November 9, 2025 12:25
@robertkirkman robertkirkman force-pushed the fix-conflict-of-editing-tur-folder-and-tur-on-device-folder-simultaneously branch from 50c80e0 to cb8b820 Compare November 9, 2025 12:26
echo "$archive uploaded"
tur_on_device_archive="${archive//.tar/-tur-on-device.tar}"
mv "$archive" "$tur_on_device_archive"
gh release upload -R https://github.com/termux-user-repository/tur "0.1" "$tur_on_device_archive"
Copy link
Member Author

@robertkirkman robertkirkman Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@licy183 do you think this will work?

I don't want to separate packages of tur and tur-on-device folders into separate PRs,

instead, I want to try to fix it permanently so that the problem never occurs again.

However, unfortunately, I don't understand exactly what causes the problem, only that there was an error with this file conflicting because both workflows ran in 1 PR.

Can the code which takes the unprocessed_debfile https://github.com/termux-user-repository/tur/releases/tag/0.1 and sends it to https://tur.kcubeterm.com automatically handle the filename sometimes being something different, like debs-{aarch64,arm,i686,x86_64}-${{ github.sha }}-tur-on-device.tar, or will that not work and it has to be exactly debs-{aarch64,arm,i686,x86_64}-${{ github.sha }}.tar every time?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should work correctly. Currently, the scripts in the dists repo do not validate filenames.

Copy link
Collaborator

@licy183 licy183 Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't work as the CI reuse can't pick up the files uploaded by the on-device worflow. The best way to avoid this is avoid building tur-on-device packages and tur packages in the same MR.

Copy link
Member Author

@robertkirkman robertkirkman Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh no... actually, I did not ever know whether CI reuse would actually work with tur-on-device or not.

The reason why I pasted the lines for it in this commit 70cc0df was because if I didn't do that, a build error occurred because of a variable or setting of some kind missing that prevented building all tur-on-device packages at all after the merge of CI reuse in the main repository.

I don't know how to fix it, so it is necessary to disable CI reuse for all PRs which modify tur-on-device packages.

I am trying again here

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact, CI reuse can work on tur-on-device.

The situation where it doesn't work properly is when the packages from tur and tur-on-device are modified in the same PR.

I think there is no need to revert it. I've uploaded them manually.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact, CI reuse can work on tur-on-device.

I thought that it didn't because I saw this log, in an earlier PR where I modified only tur-on-device packages:

image

https://github.com/termux-user-repository/tur/actions/runs/19011632972/job/54293393376

Do you know of an example where it worked?

Copy link
Collaborator

@licy183 licy183 Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should work, but I actually don't know whether it works. The most important thing is to avoid modifying build.shs in both tur and tur-on-device in the same PR.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to fix it so that modifying build.sh in both tur and tur-on-device in the same PR is possible,

because I do not want anyone else to ever encounter the same problem, and the draft PR I opened can do that

However, it does it by disabling the CI reuse for tur-on-device PRs.

I will try to figure out any possible way to do it without disabling the CI reuse.

I believe that part of the problem is that the CI reuse has never worked properly for tur-on-device packages (which can be seen in the log above), and fixing that might be where I can start, I don't know how to fix it yet but I will try

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See, it appears that the CI reuse still does not ever work in tur-on-device even if only tur-on-device packages are modified in the PR.

image

I still will continue trying to figure out how to fix it

@@ -0,0 +1,15 @@
'git reset HEAD~' is TEMPORARY - work around bug in lint-packages.sh
will discuss with Tomjo2000 and fix upstream later
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have discussed now, and we think that it will get fixed by today's update to this:

this patch can be rebased to remove git reset HEAD~ after that PR is merged.

@licy183 licy183 merged commit d0dbfdc into termux-user-repository:master Nov 9, 2025
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: blender4 needs rebuild

2 participants